Fixed the latest codestyles