HomEmb: Some refactoring.