Refactoring bob for readability