rapper of the week and month plus refactoring