removed unnecessary vars and params