Clear up spacing, remove prints