#15 - Clean up sync a bit more