Cleanups
Playing with init... :-)