fixed some elements in hypothesis and controllers for clean design