Cleaned up some bits and bobs.