small updates/cleaning