cleanup, function names, gitignore, files