Generally improve readability/standards