Complied with JSHint recommendations