Very evil remove bug
Beautify