refactor source to make Maven happy