Addressed some of the jshint errors, want to review the rest with Yonatan before we change them