Clean code

Removes unnecessary & commented code.