re-indent and clean up, make slide close a bit nicer