fix missing initializers warnings
extra spaces cleanup