Fix portability spacing & maintainer