minor changes + clean up