custom extension comments / cleanup