Minor fix

1. Formatting
2. Add uuid to Makefile