Cleaned things up...