Refactor and add week #5