Tidy up LayeringCalculator