Fix everything nice and prettyful