Added return fixer to CS config and fixed return in files