Code clean-up and gitIgnore modified