Applied some code suggestions made by Syphurith.
Applied some code suggestions made by Syphurith.

ApacheThunder/rxTools,ApacheThunder/rxTools,laureolus/rxTools,laureolus/rxTools,ApacheThunder/rxTools,laureolus/rxTools