Autoformatter changes, TODO comments.