Clean up JS a lil bit