reindenting + (very) small change in design