refactoring

white space fixes