Added comments and cleaned up the code