Minor cleanups

Add comments, remove debug prints