Removed Magic Numbers and Strings