Formatting

Should conflict heavily with local changes on desktop computer (this was edited in GitHub directly).