Minor corrections and cleanup