Minor cleaup