Refactor non-bang methods