some style and structure updates