spaces issue
fix typo issue
[some modifications for team member]