Fixing typos, indentations, imports