Code autoformat.
added semicols;
removed duplicate code.
Refactored the uuid service, to be more efficient.