<raja>tidied up Home controller