Clean code, switch to more generic accountable method