Refactoring working a little too good. Fixed constants.