Fix style issues identified by KWStyle