cleaned up as much as i understood in schema