Cleaning up class method definition for cleaner implementation