Minor fixes and style update