updating to include latest stylistic changes..

updating to include latest stylistic changes..