Added some comments and cleaned up code a bit