Clean code (remove debug display)