Code organization cleanup