Cleanup - use jquery