Cleaned up graph controller