Minor refactor will start working on small adjustments now