Removed hard coded variables