Goa minor refactors