moar formatting tweaking