Take a look, mostly style improvements. ;)