Style improvement
Bug fix