client/server: Refactor notes