Code cleanup.
Merge branch 'master' of ssh://github.com/svic/gaia