small changes & clean up