Clean up octo commands - make safer and cleaner.