Remove variable hard-coding