improvements & cleanup