Refactor method names and success verification