Remove TK; Improve readability