Refactor Bank Class