style changes
Merge remote-tracking branch 'phu/gitlab' into gitlab
Small tweaks