updating to make clean up format and syntax for our team