Finish minor refactor