0.1 cleanup and integration of lombok