Do small refactoring
Make it possible to specify return values