Moving toMap methods, clearing up Javadoc