Initialization added and cleaned a bit