Remove explicit getter/setter for consistency
Remove 3rd check (although it's the charme)