Refactor and improve the resume