made formatting/tabbing consistent