Replacing current implementation with a helper method toggleProperty