Fixing typos, aligning code