Reorganize a little bit