Cleaned up a few namespsaces