Remove commented code
Beautify the code