Polishing: remove redundant id calculation