Cleaned up the home interface