Update method signatures
Fix erroneous call to __construct()
Adjust function declaration code style