refactoring of todo methods (use complete if-elif-else - more explicit)