Slight proof refactoring