Add Home Easy
code cleanup