*8594* Style/complexity cleanup