Refactoring/initializers

Conversion of boost::assign to initializer lists. Need at lest test with VS.