Cleaned up some more. Yeah, I know... sorry for many commits :)