Cleaned up the lint, but tests fail for Intro Simulation because (I believe) EnergyChunkDistributor is taking too long to solve the initial positions of energy chunks.