style fix, put return up top