Fixed account selection bug

More code cleanup
Method name generalisation