Cleaned up, removed excess comments and excess code