Cleanup generic usage for property and var