No functional change, just cleaning up code format and removing unused imports