Cleaned up account controller.