Cleaning up and moar analytics!