Add helper functions for most common graph sizes
Cleanup with new helpers
Slight cleanup, especially imports
Added TODO