cleaning up hard coded values