Final tidy up before minifying