Some code cleanign
Merge pull request #176 from bortevik/rc8

Some code cleanign