bit of cleanup, some changes, nothing special ;-)