General cleaning up to look like a Real Program