split longer lines in init
made first round of recommended changes