Simplify gragh construction