removing the cycle timeout and cleaning up some whitespace