Code clean up

Use the mythical "and" statement
Check for sourcetv and replay