Separated analyses to run independently, and cleaned up