replaced a lot of code with lombok annotations