move getter/setter defines out of the constructor