Change for a simple return and small cosmetic fixes.