(Bug 2150) Remove spaces from variables and hardcode