Cleanups and Visual Tweak

It looks prettier and a little bit tolerable now. Both for the code and the output.