Refactor list console