Headers, formatting, minor refactor.