Clean-up .gitignore files, minor code clean-up
Code clean-up