Class renamed. Constants replaced with class constants. Code improvements.