simlpe code clean up and re factroing. organized imports