Enhancement: remove debug code, improve naming