PEP 8 and refactoring.
Updates related to the PEP8 and refactoring changes in Razors.
Forgot to change the default timeout after testing.