Split out more code files. Add commas and spacing where appropriate.