renamed variables and cleanup
Merge branch 'brent' of github.com:MGM-KTH/intfact into brent