Fix code standard violations