Comments and adjust initialization