Small fix for populating prereq, Cleanup