Initial commit
Modernized and harmonized the code