Refactor Bob class based on 2 nitpicks