[IMP] account : Improved the code according to the general remarks.