More Code Formatting, Updated sources to 1.7.2

but should run fine on any version on up.