slight cleanup and fix