move definitions to class body