Formatting
Little tweaks, most things moved to jenkins now