cleaned up req builder #93