Clean up code style

 - Use existing idiom for tomcat-pkgs

 - Avoid setting service_name twice in service resource

 - Move SMF updating code immediately above service resource

Thank you @btm for your guidance on these changes.