cleaned up JS a touch from all my experimentation :muscle: