Added doc
Start moving constants to separate class