[fix IntelliJ IDEA warning] synchronizing on non-final field
Mostly code cleaning
- removed commented out try/catch (replaced by exception mappers)
- fixed IntelliJ IDEA warnings
- implemented IntelliJ IDEA code suggestions
- typos