format fixes; remove all caps var names reserved for constants