#916 Apply rules for coding conventions furhter