Refactor: Continued to marginalize SideDef