Some cleanup and formatting