Minor beatufication and adding initialization section