TODO updated, comments removal