Fixed a unresolved symbol error, and some cosmetic changes.