refactoring and installation feedback thanks for the help @lucasmartins