Refactor ProfileReader