Reorganize slightly