BasicSparrow - comments & cleanup