Minor refactor and moving around.