Removed Magic Numbers and commented out placeholder