some format fixes and removals