Boilerplate cleanup

Started cleaning up the basic boilerplate code.