Cleanup CSS and code