Cleaned up the reader/writer/visitors