Update import style
Small updates and re-execution