Cleanup for porting to py3. Ported one solution