extra spaces after most of changed lines in this file @KhaledHelmy