Clean up and mappings approach