Added installation instructions
Cosmetics
Refactoring