Initial refactoring : Change from unnecessary static design, replaced "magic" values with defined constants