Refactor

Removed all magic numbers to constants
Implemented all constants where necessary
Cleaned xml with styles
Removed unecessary code