cleanup & small changes