pep8/clean galaxy interface
Merge.