refactor note a bit