cleaning up UserCode area a bit