fix glaring coding bugs (due to merge activity) + apply coding standard