removed lombok, optimizations