split AccountStore into seperate file; some lint cleanup