Refactor

@jvanderhoof