Mojo cleanup

I did some cleanups, hope u like it.

My Aim is to understand ur code and write some rules on my own ;)

Cheers Lars