Removing testing code, fix standard