Fixed some spaces issues