Improve CSS parser organization