#1: code cleanup