A few clean ups before minifying