Cleaning up style