More functional niceties

Some changes made per comments by @andytuba.