changes by convention + fix styles (#1106)