Cosmetic changes
blockwise optimization re-instated