CSS code cleanup for easier development