CheckStyle fixes, logging and minor re-factoring of skeleton services.