Account class edited
Renaming & updating forgotten things