some more cleanup / alignment