autotools update

also edit the source file to conform to my personal style preferences