Minor whitespace changes and shuffle functions around to be in a more logical order and reduce the need for forward declarations. Also make a few functions static.