Fix more typos + reduce dup code