Fixes for delete_snapshot and PEP8 compatibility