Minor changes
Mostly unifying the coding style