removed syntax errors
Merge branch 'refactoring'