cleaning up mentor module a bit #143

cleaning up mentor module a bit #143