Improved style by removing return statements.