Refactor the Banshee