Liiiitle more cleanup.