Reforming more code blocks