Review code and refactor Story ID: C18