Tidy of homecontroller