Style Update
Reduced numbers of vars
Removed timeout