code cleanup
Refactoring of serviceId generation
Whitespace cleanup
Removed capacity planner tests from deployment planner