fixed small issues with interface and removed extra Account class