Code clean
Adapt as in AHomeM
Clean
Code Clean
Minor changes