Code clean-up for graph package.