multi-line constructs clean up