Fix various stylistic issues

Per review feedback from Harold Giménez.