trailing whitespaces
some refactor
some refactor
cleaning code