Initialize late + some cleaning up