Added Constants class; Reorganised some methods