Format; clean up magic plugin