Clean up on styles and templates