cleaned up code, removing some comments