Added comments and cleaned up codes