Account information maintenance added.
Code cleanup.