Beautiful Update 1.0

Removed old code (added a bit of unnecessarity) and Commented everything properly once again