beautified
Merge branch 'make-more-shit-static'