Improved on Account.java