removing hard coded values