add main separately - standardizing
change function names and remove class dependency
remove redundant imports from main