fix old declaration style
fix missing initializers warnings
extra spaces cleanup