#25 refactor: simplified timeouts