Tidy up

Changed RC Timeout

and made IF statement style inline with others