Styles and general fixes to ENCON
Merge pull request #13 from profbass/master

Styles and general fixes to ENCON