remove commented code
refactor synthax