[style] Cleaning

test commit
Merge pull request #267 from samvo/master

[style] Cleaning