Remove unnecessary synchronization
Remove unused setter
Put classes into separated files
Code refactoring