Removing brackets from functions, adding simple variable declarations, fixing tests