can these be tidied up to use classes, rather than elements