changing some indentation and whitespace to prepare for rewrite