Select Account Preferences Implementation
Some code cleanup