Tidy up code and comments after restfs refactoring