Start long process of cleanup.. Remove K&R style coding