Bit of refactoring just moved local vars to properties