Added installation instructions
Removed wrong comment
Cosmetics
Refactoring