Issue/requires keyword

fix for requires keyword + small reformatting

Should be backportet to 3.0