Clean up some Project 3 stuff a bit