clean up wham stuff a bit