fixed initialization, style issues