cleanup + fix some align blocks