HG-91 fixed some node-side code problems, indentation issues