#332 - CodeSync refactor