Code clean-up on silver-sword.lisp