Code cleanup and git ignore update