Generally improved code