Improved code
Remove comments
Indent code