General RWD system tidying

Just a little code tidying.