format and comments

should be the final main commit before turning in