begin refactor css