minor annotations, preparation for level, logger integration