TODO is now more readable