Refactor toMap -> map