refactor FooBar class
Merge branch 'foobar'