edited file names and added some commenting / clean-up