cleaned up everything a bit