Refactor help methods and other minor things.