Start of Maven publishing
Now publish to Maven depending on CI switch
Minor reformatting.