#48 refactoring Base: make variables not qualified