BasicSparrow - comments & cleanups