Cleaning stuff and removing comments