Code style update & inspection fixes