Fix identation (again) + return val