Clean-up for style