Refactored TODO, modularized