Adjust method visibility, reorder methods and add TODOs.