Fixed instantiation
Formatting