Formatting changes and push functions into subshells