Trying to refactor a little bit
Making function return two values for subclasses that need it