Some cleaning
Adjustments for linux installation