[CHANGE] srv-id with formatter; removed useless if-statement
[CHANGE] reformated for loops
Merge pull request #10 from brtz/develop

restructuring