Fix some formatting and make sure to call the super class constructor