moving things around, cleaning things up, commenting things
merge commit