Reverting style changes and fixing variable / service naming bug.