Sync: More explanation what is happening and code style fix