Rename and make beithell obvious
Fix files emacs-like style