Labelled crates and tidied code