Refactoring

#1 
spacing?