code cleanup... kind of...