Cleanup style and remove extraneous methods/objects