Did some cleaning up and prepared for the "cons" mode.

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