Unified the formatting, and fixed the Ubuntu module