Very minor refactoring, eliminated the return of only color mappings.