Fixes final cosmetic issues of #27