Simplify shape functions