Fixed minor namespace and whitespace issues