Cleaning up more reader code and adding more Javadocs.