- Fixed compilation error
* Some cosmetic changes. Removed unused code