Cleaned up a few type declarations