readability cleanup
ao: shutdown properly