Code style fixing