Refactoring and cleanup in neutronvpn-api