Cleaned up graph component