Signature: Moved functionality to class from around the system