additional comments and cleaned up lint errors