Minor code formatting changes along with a fix for a botched merge when compiling with no chemistry.
closed