Refactor to follow lowercase_underscore style
Refactor bucket tear down into function

Tearing down a created bucket is now a separate function, since we have
to do it separately twice.