Refactor some code. Refs #251