Do some refactoring, possibly fix aircrack calls.