Change TODO to meaningful comment