fixing naming conflict, cleaning up