updated gitignore
code cleanup and consolidation