Refactoring
Constructor
Reformat