removed constants c/p
updated constants
refactored class vars