Fix some style issues in returns