more reformating and cleanup