minor fixes

remove "using" in header file
and other non-logical changes