fixed and cleaned up kitchensink