clean up of whitespace & code formatting