Cleaned up types