Simplify definitions