Cleanup and Comments

Also deleted some redundant/unused code blocks