Improved refactoring and movement

Refactor fn to defn support
Enabled { and } to move through top level sexps