Overhauled formatting and removed everything we aren't actually using.