fix spacing
fix typos and clean up