removed unused, fixed naming