Code style improved