add some level of standardization, multiple code fixes
add some level of standardization, multiple code fixes