Fix TODOs; remove the indent of public, protected and private.