Added account settings
Fixed multiple law of demeter coding violations