Refactored synchronized methods to synchro blocks