Some style and basic structure updates