Added edited files with clean-up comments