Minor updates and cleanup