Simple refactor to allow for Eclipse