moving the using lines inside the namespace declaration and other minor formating updates