mostly typos & indentation