Beautify the code
Removes old code