cleaned code, introduced -commonInit