Clean up for style consistency