modified structer and use jslint