Small update/clean up