Clean up style issues