-cleaned up types file