Code formatting
Refactoring to use heredoc