Clean up some warnings, dead code and use some nicer notation..