cleaning up code and files, part 1