Remove magic numbers from common library
As part of our quality update, one of the things we scan for is ("magic numbers")[https://rules.sonarsource.com/java/RSPEC-109/]. We should remove all instances of magic number and manage these properties properly.