cleanup spec name
underscore class name
added recurring bills