Rate checker refactoring

@ascott1 When you get back I can run you through the changes I made.