General cleanup.
Use CamelCase in source, plus general cleanup.