Refactoring

Trying out a new commit message format, as well.