some refactoring
white space