More cleanup and some extra shortcuts