More syntax fixes. Making everything neat.