Assignment Completed - minor cleanup