Spring Cleaning

Deleted unused code, prettified things, and added comments