Reformatted, Rubocop'ed, and annotated