Cleaning a little bit the code. Just identation and removing unecessary files