Some cleanup and reformating