Minor code formatting improvements.
Minor bag performance optimisation.