Jake

Just some code cleanup before we get started.