Optional timeouts for execute calls
pep8 tweaks