Audit and style fixes