fixed show production and cleaned up code