Fixed code style
Removed unused files
fixed coding style
Merge pull request #808 from bibich/improvements

Improvements