Refactor code <cont.> and complete customer