Fix formatting
Update members