remove unused helper namespace
cleanup formatting