Mostly refactoring, such as aliases into functions.
Added style guide.