Added attributes in a separate class
Replaces all hardcoded values with values from the attributes class and
cleand a little bit :)