Code cleaning
Fixed initialization issue