cleaned up after J