Some cleanup
More cleanup
Fixed a fatal error due to the alphabet indexer accessing a nonexistent column