tidied homeoffice mappings