Cleaning the code

Nothing major