CamelCase all the things
Remove inline control structures