cleanup of some formatting