custom: minor fixes and tidying
custom: minor fixes and tidying

jcpeterson/Dallinger,jcpeterson/Dallinger,suchow/Wallace,Dallinger/Dallinger,suchow/Wallace,Dallinger/Dallinger,suchow/Wallace,jcpeterson/Dallinger,jcpeterson/Dallinger,berkeley-cocosci/Wallace,Dallinger/Dallinger,Dallinger/Dallinger,berkeley-cocosci/Wallace,jcpeterson/Dallinger,berkeley-cocosci/Wallace,Dallinger/Dallinger