Removing hard coded values