Update license
Remove unneccessary empty lines
Add method to getMachineId