Cleaning up hard coded values Issue #7