cleaned up code, deleted comments, etc
last commit before demo day, removed some comments