Trailling space and small modif