Kind of cleaned up everything !