warnings on sync methods, minor code refactory