cleaning up code and update git ignore