Clean up params method further
Small nitpicks in refactoring
Replace last strip_heredoc with gsub