Major commits - stylistic & JS mostly