Spice Cleanup and Some Decorations added