Fix formatting and cleanup
fix import path