Cleaned up some stuff and made class and namespace work better