refactoring monthly and weekly methods