updated gitignore, clean up code