Unfunkyfied and refunkyfied a bit.