Cleaned up unused CSS and parameterized CSS class names