fix formatting and remove TODO comments