refactor to include css "shorthand"