Cleaned Wawla up a bit.