Correct spacing issues