Fix style issues

Fix some minor issues (mainly style) reported by PullReview