More appropriate naming + strip cruft