remove keywords, use get/set names