fix formatting and leave todo