Style fixes and other modifications