Style consistency tweaks
Re-adding service definition inputs
Making the log wording more consistent