Documentation and refactors of silly names.