formatting, tab removal, code cleanup