namespace cleanup

using class instead of using namespace to keep namespace nice and clean!