Did a bit of cleaning up and name-improving.

Signed-off-by: Jakob Brandsborg Ehmsen <jakobehmsen.github@gmail.com>