cleanup of formatting