cleaned up js selectors