add some return statements
string interpolation
remove anonymous functions