cleaned, added pymode