make one line functions two lines
add function specs where appropriate