Add 'self' to all class functions