Changed variable names, added space