Completed Code Inspection and Refactoring