Refactor week1