Code style bug fixing