Refactored beans using lombok; minor cosmetic changes