Small code style changes
Merge pull request #1 from joankaradimov/style-changes

Small code style changes