Call class functions and remove return statement