remove bad unloading
fix indentation