Re-formats code and and changes some selector nesting