Indentation tweak
Use more robust way of swinging (#60)