Removed some complexity in HomeViewModel