Indent 4, fixed some jshint errors