Begin a small refactor of code base