cleaned up code and removed notes/comments