Trying to clean up formatting (mostly failing)