Cleaned up ExtraDecor code