Style check && exchange declare fix