js cleaned up