Maintenance/refactoring

`.`?