[IMP] account : Improved the code and also removed unwanted code.