Changes based on some recommendations from CSS Lint