De-cruft
Better ending