Check for updates only once and a bit of style
Minor style fixes
Merge pull request #1 from lucach/upstream

Check for updates only once and a bit of style