cleanup / re-arrange