Removed hard-coded variables