changed more code style to comply with guidelines

21 jobs for !5635 with add_CFSReader_plugin in 0 seconds (queued for 4 seconds)
merge request