NOJIRA: code cleanup only
NOJIRA: code cleanup only

itsdavidbaxter/Tools,itsdavidbaxter/Tools,itsdavidbaxter/Tools,itsdavidbaxter/Tools,itsdavidbaxter/Tools,itsdavidbaxter/Tools,itsdavidbaxter/Tools,itsdavidbaxter/Tools