clean up account controller more