Minor cleanup of if/else/if
Updated gitignore