format - cleanup