Added comments and cleaned up the code a bit