A bunch of small improvements.
Made everything more readable (hopefully).