Output cleanup
Cleanup code

Change-Id: Ib37a96edd5e2435af19431acc1a964eda4ab6787
Add SHA512 sums

Change-Id: Ia5d93c24a664486799595296d67e853603a3816d