Cleaned up some types