Added comments and cleaned up