junho weekplan model refactoring