refactoring variable names and organizing css rules