Fix style according to @mglukhovsky comments. Related to #1307