Minor cleanup, addition of a short Edwina banter