Fix style consistency issues