Tweaked formatting
Removed useless code