Added comments and cleaned up logic