Updated to follow guidelines from latest module pipeline

Trying to stay on par with the website service module as much as possible.