some code cleanup, update to use the css bindings