Remove s.el dependency
Clean up variables & comments
Implement 'whole-line scope