Refactoring

whitespace-cleanup