Re-code, Add Comment, Add TODO