Code styling + fix typos