Fixed some spacing issues to cleanup diff