Initial formatting pass

Change the code style to something more consistent.