Swipable: further simplify, and fix some weird indents