Clean up and capitalisation