Hopeful speed improvements and formatting looks nicer, in my opinion