Implement timeouts
Fix typo
Shorten the line
Style fixes