Removed Magic Numbers from Main class