Removed internal var names as no-one is ever going to use them