Fixed ChangeRoom bug

Also did minor style changes (using var for declaration, etc.)