Fixed whitespace and spacing issues