Remove extra newline, rename helper method to ...WithPort