Refactor

Some last clean up before I extract relax to it's own repo.