finishing up CSS parser refactor