refactored variable names
changed filename

TODO: change classname hyphens