cleaned up schema slightly