removed the extra account type and refactor a little bit