Added comments and spaces
Merge pull request #1138 from BartlomiejLewandowski/selection-cleanup

Selection cleanup