I did some refactoring...

Don't mix normal commits and white space commits pls