Commented init code. Moved common code into extension methods