indentation and replaced deprecated packages