Cleaned things up