Cleanup the code a bit
IDE files updates
Update .gitignore