Beautified
Removed commentated code