Start refactor and code cleanup
Continue to refactor solution