Trying extracting methods... Not sure if fine refactoring