Change to jquery, add more camelCase