style and format fixes