Cosmetic indentation cleanup. No changes in results
Adding objective weights for constrained optimisation. No change in results.