Refactors and cleanups

Merged Dave Patrick Caberto requested to merge SeaDve/bustle:cleanup into rustle

See individual commits

Merge request reports