Completion - Remove unnecessary quote-marks and a return statement