Fixing typos, coding style