Fixing all problems + clearing the code