source cleanup - looks like i missed an 'and'