Minor presentation changes and refactor