corrected a few this occurrences
shoving constants in constructor