Did some major code clean-up with Eva's syntax formatting classes.