Refactored sidenotes