Small update and cleanup