Refactor simple blocks into single line