DataFrameExpression, prettier graph output, neaten code