Huge Cleanup and Lombok added for easy Get Set