Cleaned up insert fields