Refactor .aside and .aside-witness