Cruft removed / better organization