Refatoring repo
Refactor component