Move into single block + fix issues with multi-line-commands and variables