code updates/cleanup