removed some comments and cleaned up code