simplifying elements as we don't need data-attributes anymore (they are stored in coffee class), clarifying/renaming/simplifying more options