#163 fixed, cleanup