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