Updated style-guide and some tweaks from testing.