fix initialization, reformat things properly