reformatting function and variable definitions